Merge changes Iefc46d8f,I8f65096d am: 4aef28ae89
am: 8b7acf298d

Change-Id: I7670fe907b2de61f71bd3883d006bc4a47d0cb78