Merge "Guard against sample time overflow" am: 7639616e4f am: 5dfade5b09
am: 33d1c4edbc

Change-Id: I7cb4bfd82c1882d53177aba82dd7849c21692dd6