Merge changes I96dd5761,I196c2eaa
am: 7255fc4fff

Change-Id: I19711638b166ae81447b1af0b3dbbc5d88f80426