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

Change-Id: Ifa7481705a4333a509db45c61fcad31a471bd621