Merge changes I7065d081,Ic7c3a331,Ia432057b am: 2458be40f4

Change-Id: I1e5d79606f63540f2d9ae3187057e2ba84f4dcb8