Bug 55208 - invalid literal found for minutesDiff

Refactored also time delta computation.

Change-Id: Ib937194ab690511293c85fb0d9639db8efc0ab4b