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

* commit '3c1714cd2fd9eb0207df89f945077400c0192c36':