Add the nopass handling in the Android client.