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

Change-Id: Ife6238e2aec9a053e68fe4af0064e5f850b23461