DO NOT MERGE: Merge Oreo MR1 into master am: 78475cdcf6  -s ours am: 5ce6f98c6e
am: 0cb24f921e  -s ours

Change-Id: I2184680108315dcfeadfb1ff2ce2080a60986819