Merge changes I78f273db,I2fdaa9d3,Ib6e1df87 am: 67bf7dff4a
am: e4804ddb74

Change-Id: I8e32d8296ae87fb66fda75ac4cc58cbdf89b17d7