DO NOT MERGE: Merge Oreo MR1 into master am: cd5ad4f08f  -s ours
am: 340d9a0fb9

Change-Id: If9eed9c78e739581d0a54b0b16b8b736e9d7235f