Merge "Fix cleaning up all unknown hal templates." into tm-qpr-dev