Merge commit '6d0253779d72fd2f5d16ac1e6e52f6b4c0535ff4' from oc-mr1-dev-plus-aosp into stage-aosp-master.
am: c4e7d852f5

Change-Id: Ia2bc45e26404b3de87b94550481e9594f68d49bf