Merge changes I2123f37c,I56efda40
am: bc583a065a

Change-Id: If4caad91bce1c63c6d0b4dbd97c843e605b42403