Merge "Merge changes I768830f5,I665bde3a into oc-mr1-dev am: 7876b630be" into oc-mr1-dev-plus-aosp
am: 08ca3cc7e8

Change-Id: I86ad97ddb4060a2fbd23e7a2105ee4c98b782b46