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

Change-Id: Idadf26f4ef05cfbcf9b6f8b74d12d1e1ee28e017