Merge commit '1071dd7523cbacbf6c8c1306f958435465ca8084' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I5604336aef76a427ad34fa4541497b0549bc0d66
Merged-In: Ib8021d308781d8c941c10d231d5bad8896bdb370