Merge "Fix testActivity on buildbot"