Merge "Avoid crash for stss sync sample number 0"
am: 11f51b0463

Change-Id: I923fe096f4b9fef2d9b5b3a6e5674a0283b9f65e