Merge "Update constants used for resolving shell services" into tm-qpr-dev