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

Change-Id: Ic8ed2801665bfcee277b9a57fc9fbf1ba658ae72