Merge changes I7065d081,Ic7c3a331,Ia432057b am: 2458be40f4 am: 172d2ce499

Change-Id: I801b7f351988322648108a15f7e5d06a47d3a102