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

* commit 'c9e43b1dbbefcc5cafea87976e9f6a59163731a0':