Merge changes I2157efc5,Iaf1d6f9c
am: 78522d3676

Change-Id: Icc95f162fffdd3b17daa644c656584c35d3c976d