Merge changes I9fc5738d,If4eee63b am: c206e20e48 am: dbc0aa539d am: 3a703d48fc

Change-Id: Id3e467441656e71a36a9f74794c02708c843a5fc