Merge commit '222107507d126c33bd48647fb92e0b4021fb861f' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: Ibd45fbd904abfbb986d8f3adfc415ddd0e35b1e7