Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp * commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e': Instead of asserting return a runtime error if the maximum sample size cannot be determined.
Merge commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e' into gingerbread-plus-aosp * commit 'f3de053c0a525f85f763ab9b8781ae95ef3e930e': Instead of asserting return a runtime error if the maximum sample size cannot be determined.