Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 5d66dfc3b3  -s ours
am: 9b369b3e85

Change-Id: I657ca3747fd938c2fcb89c85ae272ec00c0b0d42