Merge "Remove excess logging in secdiscard"