Merge "Remove References to Securedlab"