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

Change-Id: I21a744c8caff8a0a2491b0279b13e92cfab05216