DO NOT MERGE: Merge Oreo MR1 into master am: 19aff01a0b  -s ours
am: c8bb8b141c

Change-Id: I979cb2e856dc0ac4df8f150a3ec22bfdde6a9fad