DO NOT MERGE: Merge Oreo MR1 into master am: c1b86593af  -s ours
am: 971772ce14

Change-Id: Id3d237b7af3727e5fafb1ea87079f0e2453b4fbb