[Android] URBNG-427 and URBNG-428: Fixed bugs.
Merge pull request #85 from element31/android

[Android] URBNG-427 and URBNG-428: Fixed bugs.