Android client production code

No newline at end of file.