Merge "Adds support for PARAM_ACCOUNT* to Combined URI"