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

Change-Id: I2cfc6f796d34e88378b5853ad6133ce7e5358324