Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 56b0e8c1df  -s ours am: d0271a642a
am: 54018cc991  -s ours

Change-Id: Ic4cf2efd7603cb01d9bf11be0b0245a8b46a2ac3