Merge "Clean up unused codes around the RemoteUserInfo"