Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 770d6ed9ff  -s ours

Change-Id: If36de345980263407ac6273e0ac4663c06ed37a0