Merge "Update build target names & code location for roleservice.proto usages in framework." into tm-dev