DO NOT MERGE: Merge Oreo MR1 into master am: 78475cdcf6  -s ours
am: 5ce6f98c6e

Change-Id: I6acdb6d2ad3ba1e5b5866df44785c23c562423ca