Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi (2/2)"