merge in lmp-mr1-release history after reset to 345fbb2613e3a1985108dc2c42ceabe2711243a6
The Android Automerger [Thu, 23 Oct 2014 13:12:16 +0000 (06:12 -0700)]

Trivial merge