Fix emulator tests failing on CircleCI#591

Merged

ace-n merged 3 commits intomasterfrom

circle-fix-emulator

Mar 30, 2018

Commits on Mar 30, 2018

Attempt to fix CircleCI timeout issue (take 1)
Ace Nassri
committed
Fix circle failures + remove extra TODO comment
Ace Nassri
committed
Attempt to fix circle failures (take 3)
Ace Nassri
committed