Bug 931723 - [HW test] multiactivities doesn't work
Merge pull request #13280 from MBRSL/bug-931723-multiactivities

Bug 931723 - [HW test] multiactivities doesn't work, r=gasolin