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

Change-Id: Iaf770469ae842dc0220f557eaaffb39ba0b3ce5e