Merge commit '587cdcfbad39f38bdd25c267eeae01202a52f29d' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
am: 3c11dd99cf

Change-Id: I0f024dfa3ae7ddfa1d322c6969b2a195628efac0