Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f325208b4d  -s ours
am: d47aaaf98d

Change-Id: I2bc8e3f0d3f0d0d9e0f6a85bfe8462b061dd28a5