Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. am: 47beb1e8a3 -s ours
am: 1f3983785b -s ours
Change-Id: Idfc0b2349f7475089373c8fdceebe7f166a5cd37
This commit is contained in: