DO NOT MERGE: Merge Oreo MR1 into master
am: be7845704f  -s ours

Change-Id: I3a955304733a2db9d56f6a32fa374f52ed6ebc09