Merge "[DO NOT MERGE] Check caller's uid in backupAgentCreated callback" into tm-dev