DO NOT MERGE: Merge Oreo MR1 into master
am: 19aff01a0b  -s ours

Change-Id: Icd7b2aa72a824e80c33cd97dd8661f4ae949a57f