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

Change-Id: I0448adf35221404dbc19c4ed14f2d0252770499e