DO NOT MERGE: Merge Oreo MR1 into master
am: 6f110bb98d  -s ours

Change-Id: Id206a03d05f2c8577630d1a6f42de188607e800e