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

Change-Id: I8e2ec84d8e11217b94c2d7bda627be6ba27b3453