Merge "maintenance: Fix test due to db version change." into rvc-dev am: 99ea1efba3 am: 1225204a8c am: def123a1f5 am: 6df4832ce9

Change-Id: I5ca4e0e3100ead9df49ade676ec3549a44a70e57