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

Change-Id: I9b03811411e32a00b7cc31655123859d7f57278d