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

Change-Id: I8769c374dc5f12d8b9c696e8498e4454710b5da1