merge in lmp-mr1-release history after reset to 172568141a72345cc9e7599930332d4200989931
The Android Automerger [Sat, 8 Nov 2014 14:12:57 +0000 (06:12 -0800)]

Trivial merge