Merge commit 'df3a7e797738587873f1269b2989c516ec302395' into eclair-mr2-plus-aosp * commit 'df3a7e797738587873f1269b2989c516ec302395': docs only.
Merge commit 'df3a7e797738587873f1269b2989c516ec302395' into eclair-mr2-plus-aosp * commit 'df3a7e797738587873f1269b2989c516ec302395': docs only.