Merge "CTS secondary_user: CTSJvmti..."