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

Change-Id: Ife66bc9a7c2beb0f29ede969e87d5eae901d1cd8