DO NOT MERGE: Merge Oreo MR1 into master am: 63b0ff1faa  -s ours am: e78942c195
am: 49d010a10f  -s ours

Change-Id: Icb2d89cb31284bf6593a713763f00f4d4676e2fe