Merge "Remove usage of isDevSdkInRange"