DO NOT MERGE: Merge Oreo MR1 into master
am: 216f973f1d  -s ours

Change-Id: If81c6414d650b05f5601182f77bc3b4f7bef7f6f