Merge changes Ia0ca36fc,Ib42c0635
am: 1abc3cd641

Change-Id: I67bfecac71d4fef20835dab3d226ec3d54847fa0