Merge "Use the live AdapterService in ProfileService." into nyc-mr1-dev