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

* commit '93be75925f18873ba28fffd4c11a2a2004c7312d':