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

Change-Id: Ibc85f6ab9193a0a85d7271099b6af751a1b63df1