Merge changes I9fc5738d,If4eee63b am: c206e20e48 am: dbc0aa539d

Change-Id: Ia0b4cf95fd67df533779d26086762c5f223a5fad