DO NOT MERGE: Merge Oreo MR1 into master am: 47924d1aec  -s ours
am: 4a8909eb5d

Change-Id: I36b5a06a737cf1410e446bed096e784d4cf40f58