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

Change-Id: I5a07f15be1be6e9a77df75681dd82348f88c0972