[Android] URBNG-350: Made some changes.