DO NOT MERGE: Merge Oreo MR1 into master
am: 791f9897b6  -s ours

Change-Id: Ib739b6bb7a1327c5376ff21b60fb0c2b0fe138f3