Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: d8a341b914  -s ours
am: 6819b9691a

Change-Id: Icafe49b5f116100b493ee86c0b1504f000d4210a