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

Change-Id: I7696a64499c14ae48ea0070ab443401753b3a2ff