Merge commit '97160a161f8eeb38018cd735a6adb64c4cebd375' from oc-dev into stage-aosp-master
am: eea1d23669

Change-Id: I9dd9744767029b6815c28d1d45ae50aa5e4c23b8