Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into lmp-dev am: fc9d732c am: 591a49b3 am: ee89cfbe am: e02fe541 am: 558539ff Change-Id: I4cea793a1aeaad754d0cad5a271b217e48302019