Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 18169427fe  -s ours
am: 67b89d6067

Change-Id: I572671aad772c75b16358fee543fc4d4be7edf31