Merge commit '79edadcea74151b573d5b973d5a421baee693ec1' from
oc-mr1-dev-plus-aosp into stage-aosp-master

Change-Id: I04234f284e3117e8343e7c888646400c81f5a131
Merged-In: Icf228c701afe37dd3c7f00ea9e6fb740b0d450f1