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

Change-Id: I47781cfe71941938927409c72e551f3295e1b042