Merge "Preemptive package move of Role code for use in static lib"