merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Tue, 23 Dec 2014 14:09:29 +0000 (06:09 -0800)]

Trivial merge