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

Change-Id: I576e5c722ea58916331fe6f5ecee93b4ba8d95a9