diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 36ac38b7..3b2ea9b8 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -80,11 +80,8 @@ android {
         versionName getMyVersionName()
         def x = getMyVersionCode('249c935f')
         // We are not allowed to freely choose the hundreds column as it defines the device type
-        def y = x % 100;
-        x -= y * 100;
-        x += y * 1000;
         // Update commit id to current when increasing gms version code
-        versionCode(8490200 + x)
+        versionCode(8490200 + x % 100 + ((int) (x / 100)) * 1000)
 
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86"