Merge "Avoid crash for stss sync sample number 0" am: 11f51b0463 am: 9b81cc421e
am: 2943f74788

Change-Id: If81581ec339cd237a224300e3fdaa49590cc2c07