Merge "Fix typo on db version upgrade"
am: 05f73f5a45

Change-Id: Ic61f3dbb3899eaf02a869f264739cce150f90f45