Android client production code

Right.