Merge changes I78f273db,I2fdaa9d3,Ib6e1df87
am: 67bf7dff4a

Change-Id: Ic7930621e07e2e01e4d6d59bb28e6ed2c3706773