Merge "Fix tests in apex runtests.sh"
am: 768df106ab

Change-Id: I8c86ea3e55e82c6cf612cc4ae86877e64e094be7