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

Change-Id: I33046e52ac1c59f755ef30cbf39203d914ed77c6