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

Change-Id: Ia3f61ea597b64cc0b11515d45d10c662a68295f0