Merge changes I8e76b5e6,Icf6851bc am: 4123441a04 am: 17f618fb5f

Change-Id: Ic423d1b5ca6fc89dbc69010f63c3e9e91422e4e6