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

Change-Id: I22e8705af25c100ed805dbd9af1f1c3a3e8cf9a5