Merge "Add necessary system APIs for moving role into module."