DO NOT MERGE: Merge Oreo MR1 into master am: d1a6d1eb81  -s ours
am: 73c7218dcc

Change-Id: I3aaea5ed17aff1f676a1c68b17183f234766f6ea