Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 94b8755057  -s ours
am: 817836d922

Change-Id: Id74502ef71ada04555e60232a32cf535d30f11af