Merge changes Ifd33b241,Ic8678d14,Icb2542c3
am: af3f6f8b1f

Change-Id: I12b8db7f782315e32ff0df777702332308a30bd8