Merge "Cherrypick the following CLs from LMP MR1" into lollipop-cts-dev