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

Change-Id: I8bda6fa3dee0ed6ad955c926db42a5ab87a77511