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

Change-Id: Iab1019883443835140f53a27a225534c5de3c850