Merge "Guard against sample time overflow"
am: 7639616e4f

Change-Id: Ia671a67d80f63f7c88763efbe4853d45d5e5e2d2