Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev am: 4528128713  -s ours
am: 7fc6f38cb1

* commit '7fc6f38cb1806421bf3ae6905341d74111f7de35':
  Cherrypick the following CLs from LMP MR1