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

Change-Id: I38ef4306a74fb9c1ca39903d5a74df5db0753290