Android

Completed tasks:
- URBNG-279
- URBNG-267