Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f
am: 6dfbcefe4b

Change-Id: I2c528d91424183cbc31c6d8a55ec1f35c685315b