Merge "Revert "Update trusty to use secretkeeper hal V1"" into main