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

Change-Id: I060bcfb08137d7af202c85ea7a7ffce4cb725d39