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

Change-Id: I2587ccc422bb4453ed3322a4a93686ef232a440e