Merge "Fix race condition between starting of service and getting the Profile Proxy."