Merge "Fix typo on db version upgrade"