DO NOT MERGE: Merge Oreo MR1 into master
am: 4e0c4861f9  -s ours

Change-Id: I0131132b59eb621fc272d31c51b1fc6ab9d91a2a