Merge "[bmi160] prevent generating future timestamp" into nyc-mr1-dev