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

Change-Id: I14d221c922b6fbc45d01551aca1694c40ccca9d1