merge in lmp-mr1-release history after reset to 71382693cbc81b1d131085f52d97879976706f55
The Android Automerger [Sat, 1 Nov 2014 13:11:12 +0000 (06:11 -0700)]

Trivial merge