Merge "Update art-profile for ActivityClientController"