Add back disabling of com.google.android.gms.version