Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f223ff4c29  -s ours am: 5e20696633
am: d736ac6ec8  -s ours

Change-Id: I9d8d1b9b9f01f5855e07a38aab145c237ebfcdb4