Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe
am: 27ac4ac1da
am: ac64c64f9a
am: 618f64d183
am: d635edfd04
am: 6f0c3f4bdc
am: c5ecbe4047
am: 4a45d769e9
am: e033ae9cff
Change-Id: I5e382f4500c675d4ff7e57ce0edf94b2dbf1e9ce
This commit is contained in: