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

* commit '72a4be698077f0ae2fb2fbb7793d6b22c1f985c2':