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

* commit 'eb586ce335a240d6dc2105e7bd2f53f1269ae38a':