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

Change-Id: Icc44d7c2a742366da21e2d9f0344d3663dcccfaa