Merge "Make getMinimumVersionCode thread safe."