Merge changes Icaa2d90b,Ief489088
am: ec3e77e1d0

Change-Id: I7d30a9e23ed49ef525f3c2d449bcb74bee0bec8f