DO NOT MERGE: Merge Oreo MR1 into master am: 7442d6ea55  -s ours
am: d425e96686

Change-Id: I6a31964c607df14a0922105ec0e3b5fa677b1aee