Merge "Add back non-ravenzier part of bivalent device side test" into main