Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da
am: ac64c64f9a

Change-Id: I065c4413434b01bbe13dc25437f5c45dade7acdb