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

Change-Id: I783a4f907f4a351cd9c898cf976b7d6880fdff03