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

* commit 'cb1b27b6f8e728f12a2e8a5c172aa249440d611f':
  Fine scale the decoded result to match the desired sampleSize.