Merge "Avoid crash for stss sync sample number 0" into nyc-mr2-dev am: 7d1bfc53ae
am: 92c8f3a08d

Change-Id: I78c661a7f55f85e6ce4292085e3ba9dd9421ff33