Android

URBNG-281 completed with tests.