Merge changes I7099048c,If6965979 am: fd46f62892

Change-Id: Ida71dbbdc2d608d551e5e05483f5beea3a294f65