DO NOT MERGE ANYWHERE. merge in lmp-mr1-dev-plus-aosp changes.