Merge "rdbms: Use more narrow type hints in LBFactoryTest"