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

Change-Id: I8933d6c7904ac9432d9ff17092590a6d8d52d300