Merge commit '93eb2c919ecdf32125220adbf5a2fa743af10667' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I0b2adc21234cda517b80a5afa4dfc57d749edec2
Merged-In: Ie956f68c7827b87cd51659ca035478bd11cee7b6