DO NOT MERGE: Merge Oreo MR1 into master am: e9476126b1  -s ours
am: 85f9ac6b28

Change-Id: If7bb1c68b8fadb8cb62cc268d10c11c06168e96b