DO NOT MERGE: Merge Oreo MR1 into master am: bb80b0f386  -s ours
am: 3a6ee18925

Change-Id: I5fb9b1336597db4d2f8e984c7cb54a1aa348ee19