Android client production code

Not sure ```std::move()``` is legal here.