Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 531d2dc9f3  -s ours
am: 0492cdba6f

Change-Id: I0e9204842a32798037937c2e3f686b9dd8fc5cbc