Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 7f95a5e31f  -s ours
am: c4a8bb2083

Change-Id: I338fcdc0e925551e95e073956e3dc699a9331f78