DO NOT MERGE: Merge Oreo MR1 into master am: 9490ad1f69  -s ours
am: 8f1c96db39

Change-Id: I5b98970da29f6bb3e8cad1d153d64293bd302ef4