DO NOT MERGE: Merge Oreo MR1 into master am: 46d00723b8  -s ours
am: 83e17abb9d

Change-Id: I8b723fa0775a5faa5d82af67832f0f273d904d16