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

Change-Id: I7c0c20fd9da75dcf7dcd68b7b49aaf31b77162ae