Android validation

See [AGPUSH-896](https://issues.jboss.org/browse/AGPUSH-896)