Merge "Fix build break for target build_test at 5861631"