Merge "Add clear cred implementaion Test: Built locally"