Merge "Avoid crash for stss sync sample number 0" into nyc-mr2-dev