Merge changes Ib8491242,I695758c4 am: bdad68a6e2 am: d00ad6801e
am: 5bca195ab0

Change-Id: Ibc6071a3c341ddf1e23cc2033a64fdeaaec5dd82