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

Change-Id: Ia652aac790d73def27c400b1ac327a4ad1ff8ceb