Merge "Don't override pre-release target sdk" into nyc-dev