GWTII-134: check before applying android fix