Merge changes Icd4322f2,I441ae663
am: 0525134d89

Change-Id: Ia592ec1577686a176aef4732cbcc945a8de68c00