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

Change-Id: If5ae98d3406788a1d79352dc5dded2c229415e29
Merged-In: I0b9a334d6cf8b8f091e229b542bcc3b8f37d71c7