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

Change-Id: I3c05d97bd33c1bf3a814e9386e4618a3a5cf1fe2