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

Change-Id: I13a6dbf5b431761288716d3d4b459e5153629c87