Merge changes Ia0c5e920,I71e957db
am: bdd03448c1

Change-Id: I585cca600408aeba4e605a16260b04dfd92eb10d