Merge "RemovalClient handles null authenticator" into tm-dev