Merge "Adjust check for target_sdk_version for workarounds" into nyc-dev