Merge "Provide secret to vold to remove credential"