Merge changes I2157efc5,Iaf1d6f9c am: 78522d3676 am: cda604dadc
am: 5e77a08f30

Change-Id: Ifecf754b277589ae337380ab6627f0bc9ab3ce32