DO NOT MERGE: Merge Oreo MR1 into master am: a19691092a  -s ours am: 87b25ad171
am: 367f2a0353  -s ours

Change-Id: Icdf9da336af011176a4fbb42f984b6875eacde82