Merge changes I607c6af4,I452b3f2b
am: b9596e6546

Change-Id: I2b75883ceea2af0cf58f554044557af37c89dc16