DO NOT MERGE: Merge Oreo MR1 into master am: f65cd6f6a0  -s ours am: 12ec691984
am: a5db88e4e0  -s ours

Change-Id: Idcf415d004d55a3ee0fb95c3e1d735cb65f07b37