Merge "Break unnecessary dependence on common_test."