Merge commit '021e906a46f044025ce0a4632309abecd069240d' into gingerbread-plus-aosp * commit '021e906a46f044025ce0a4632309abecd069240d': Fix docs build.
Merge commit '021e906a46f044025ce0a4632309abecd069240d' into gingerbread-plus-aosp * commit '021e906a46f044025ce0a4632309abecd069240d': Fix docs build.