Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 64a43efc26  -s ours
am: 0fe8f65ecd

Change-Id: I10040e48d060a908aea4d154a66f5ab6a97d1780