Merge "Remove process parameter from SystemApi"