DO NOT MERGE: Merge Oreo MR1 into master am: 4f804b5289 -s ours Change-Id: Ib104068eaa83a67b90dd65c1a6f4828f55f2e669