Merge changes I0286459f,I9450743e,Ibf1efea5,I48325500,I2bd36929, ... into lmp-dev
am: fc9d732ca6

Change-Id: I61b03830c2411e1a3ce055141f58136205aa7686