Merge changes I4f001910,Ic251afec
am: 301f6f3e37

Change-Id: I84e57136fef6e23175bc18344689c90149bbe341