Android fix for MPLY-5218. Buddy: Scott
Merge branch 'master' of github.com:eegeo/mobile-example-app