Bug 998757 - Follow up of Bug 972699 - Sync the changes in js-test-agent and gaia
Merge pull request #18472 from RickyChien/bug-998757

Bug 998757 - Follow up of Bug 972699 - Sync the changes in js-test-agent and gaia r=@yurenju