DO NOT MERGE: Merge Oreo MR1 into master am: f65cd6f6a0  -s ours
am: 12ec691984

Change-Id: I85b5f01da1e2ffe087090787e452cd73caf54aea