Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183 am: d635edfd04 am: 6f0c3f4bdc
am: c5ecbe4047

Change-Id: Id66af0612e1c29d234801e8b1a3f2fa90ba58643