merge in lmp-mr1-release history after reset to 54953c79547a4e2f8e690a021d44f533e190427a
The Android Automerger [Tue, 21 Oct 2014 13:12:39 +0000 (06:12 -0700)]

Trivial merge