Merge "Fix cleaning up all unknown hal templates."