Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: ba99b11181  -s ours
am: 82904944c8

Change-Id: I38215e08eab2df2f86edf0382b409970c99b5c76