Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d12204372f am: 6dfbcefe4b am: 85f575dc67 am: c5bea960dc am: c510b7fb9b am: 2f72b15892 am: 4f383edd27 am: 9d31e50055
am: 2046d33198

Change-Id: I124c627d756728847927c8a764180815a9a5fe42