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

Change-Id: Ica34036c7643495fb521b9a6f859d9388f3fd1cd