Should we be doing this for starting b2g too? I.e., at https://github.com/zacc/gaia-ui-tests-1/blob/8c3fd0d6c163de1570b73d36995ffc1a929ac441/gaiatest/gaia_test.py#L387?