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

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