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

Change-Id: Ic215514828e59b332a530e44ee2eeeab891b7cf3