Merge changes Ia8bc8706,Icef891eb am: a224da5c41 am: 19b1a8e0b7

Change-Id: I219dca5d3111b87b5ee10a87636bcda0690a66c5