merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55
The Android Automerger [Wed, 5 Nov 2014 14:13:02 +0000 (06:13 -0800)]

Trivial merge