reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.