Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: f325208b4d  -s ours am: d47aaaf98d
am: 3ede362624  -s ours

Change-Id: Ia83b36d3b5ceac4c4ab7367f96d08e3d06b483e4