Some debugging cleanup & checking for non-empty deviceId
Merge branch 'master' of github.com:rhomobile/RMS-Testing