Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 08f3b459cf  -s ours am: 5ad5eb97ef
am: 1c9bca62a3  -s ours

Change-Id: I9a9c8170122a94a08ea492dcf00c89f866148fe1