Merge changes Icaa2d90b,Ief489088 am: ec3e77e1d0 am: 8c517b7d1f

Change-Id: I3ccdf6338c2ef6f9e781e4e9c5380445548e5b85