Merge "SystemApi is parameterized"