Merge "Fine scale the decoded result to match the desired sampleSize." into nyc-dev