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

Change-Id: I03745550bfc062fdd4a93b7f607b06960c57943a