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