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

Change-Id: Ia27c986430cd8c72efb246e5d55dd9f466f272d9