Merge changes Iacc66eaf,Ia63ce164,Ib38c48bf am: 58fc087ded
am: 7278eb659a

Change-Id: I8a8e630f84a2b03bfc9c239a27b553cc0b66c10f