Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: d18ed49f9d  -s ours

Change-Id: I8a40fa162f8acfcc5f681a1419a903d27b18906c