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

Change-Id: Ied4068d43807308aaf74dbe7e9aca30359c2b68e