Merge commit '92475355055a6c064f0a4a7e1ae213089fb34254' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: Ie1723f469ab19e4ee0fbdf52eaf6e7149e05b68e