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

Change-Id: I1562e2ceeb8d1909d8d77c74625cc1661750beae