Merge "DO NOT MERGE: Merge Oreo MR1 into master"
am: 08f3b459cf  -s ours

Change-Id: I40c49f20d9b277b5e732e171bd85676ac5db3cea