Merge "Do not reset time if time was already set before" into qt-dev
am: 615618f7d2

Change-Id: I50edc0010cf224f5a3a7cbec24329836f1f06ba1