Merge changes  into stage-aosp-master
am: a83c227e04

Change-Id: I821951d01aed73f23ace36870362eb0ef875532f