DO NOT MERGE: Merge Oreo MR1 into master am: 85e907cac2  -s ours
am: b8c7094ec9

Change-Id: If83ed2789e55a495a1e0de3cdfaf45c35fcef580