Merge changes I4ae3eac3,Ibeddd7a5 am: 03c89e3907 am: cc7991ebad
am: b662a6c40d

Change-Id: I2b50c9d87f75f8f2ac50d185ebb44303bbcabed6