Added android switch back port 1.3.1