Merge "Add test to verify dex file passed to agent" into oc-dev