Merge commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e' into eclair-plus-aosp * commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e': Try to fix docs build.
Merge commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e' into eclair-plus-aosp * commit 'ae22c05b91d1e7a458066792eb5cfc0974c1be9e': Try to fix docs build.