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 am: f0a54b35c6 am: 24aeeef298
am: e6678c5af9

Change-Id: I615de2a89efb6693ee77661cd264ebf197ea92c4