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

Change-Id: I9700d94c0a4324d1be6891f0a8d146a705064640