Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 322a1f7ce1  -s ours am: d110769efd
am: da8b088e90  -s ours

Change-Id: I2036cb320ddeff2e3131fb8def53101753e3b035