Merge "auto target test breakage fix for PhoneAccountRegistrarTest" into tm-dev