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

Change-Id: I0e509a7fdea63cfdf416f69ac809944e5c070efb