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

* commit 'f1babd8ca813ee1b003a1389ff85e813b1298622':