Merge "Fix minSdkVersion scanning to not throw warnings"