Merge changes Iacc66eaf,Ia63ce164,Ib38c48bf
am: 58fc087ded

Change-Id: Ie126f36918240595ce68a5ef13c215b6a4cf791c