Fix Mobile CLI tests and rerecord
Merge pull request #1415 from pvbchak/dev

Fix Mobile CLI tests and rerecord