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

Change-Id: I4cc6276fed4fbe8c2e3fb9c8fb563cf050044b91