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

Change-Id: Id2417c64a5004de631d9bc5c5dbec2c8f3b89b8e