Merge changes Ia1b282bd,I3c53a5d1
am: 7d101a8593

Change-Id: Ifd4c1749a84db0858cd2f15473c4233666cd79d4