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

Trivial merge