Merge changes  into stage-aosp-master
am: 2d7b242700

Change-Id: Iee2f5645cbe6122eececc1f0517175daa5b414ed