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

* commit '4cc5d6f5fb85c30d2574e7bc9177caa35698ba16':