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