am 7a5f4da1: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.

* commit '7a5f4da1327011a5d3aaf28c99b98bbb1bf83b5e':