Merge changes I39354837,Id8e47f45 am: a927295aa2
am: c7b44fa53c

Change-Id: Ie2e7f60cb6bf9669344455cbaacd4b4b33d990d0