set time intervals properly

Change-Id: I76b31c4c9e61be0f25b85343c4f3b6d417599874
Merge "set time intervals properly" into production