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

Change-Id: Ia9885d8194a98e19a672748a06631f43e2f128d0