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

* commit 'cf838069b4389d7592e0469358e99f5f3d4c41eb':