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

Change-Id: I081643983d7d226d28488fde87e719c4e79e8fdc