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

Change-Id: I6dbfd91e5608f80e47bf2dc39240574ef972737d