Merge commit '41d0a16cea165552092b2bf8988b9855dea14fde' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: Idb468d122b85878d4da54b9cf370ec4f41c5c059
Merged-In: If76a2296044c23faa10424e7fb93c6b6a9111edb