Include device id
Merge branch 'master' of https://github.com/abhijitsrivastava/droid-gg-stream