Merge "align metrics start time to the previous 5 min start, instead of the next 5 min start. Also refactor config check condition to be more readable."