Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp * commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699': Fix docs build.
Merge commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699' into gingerbread-plus-aosp * commit '4f8c2f26bfd9de8c8a31369dbedd415c7d6d9699': Fix docs build.