DO NOT MERGE: Merge Oreo MR1 into master am: dc54c7eb3d  -s ours
am: 10921744ba

Change-Id: Ifc2ba60d725136894dc2729ecec8f0c74ef31dd0