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

Trivial merge