DO NOT MERGE: Merge Oreo MR1 into master
am: e6c8525cdf  -s ours

Change-Id: I8d838784d74d644575d0f65351a1f0a9770921cd