Merge changes I0d0c0fac,Ifb9b00b6
am: c3a209382c

Change-Id: If8f81cc1906668c82c2393e37600a7697cba2a05