Merge 'Update ojluni_modify_expectation.py to use 17.0.6 by default' into master

Test: treehugger
Change-Id: Ib41660af3f17cfe658bec68694b1dd761aedefe6