Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 9510528994  -s ours
am: c4fc401a06

Change-Id: I7ac682b6cbb261569035577a54f8ab9d0c6a0ec2