Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 9510528994  -s ours am: c4fc401a06
am: 5692666c8c  -s ours

Change-Id: Id25532304f3422a8b9833c09865d91e435d6127f