Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713  -s ours am: 7fc6f38cb1 am: a5d8f5eb9e am: 1c656a46e0 am: fa2dc48cdf am: 65262026c2 am: ee4e15c4e5 am: 41e3e42655
am: cf47a923ed

* commit 'cf47a923ed95dd069f921c29af70b7c9d3e53db3':
  Cherrypick the following CLs from LMP MR1