Fix bug writing tz to db. Do not merge

Fixed a bug where the token was being incremented in the wrong
order.

Change-Id: I8dbfe16b81fc463dbd196dad1c359f7751e022aa
1 file changed