Merge "Strip excess spaces in build_policy"