DO NOT MERGE: Merge Oreo MR1 into master am: 7c9d4b1384  -s ours
am: 63c9be2736

Change-Id: I3d6f8e8d1659d5af367a65623afdd52e4f68a64f