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

Change-Id: I1a5ee24b2312619a4d786f63d3b94c4ffe6e6331