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

Change-Id: Ia68e705e3907369f1451a110ae5a394dd97c8667