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

Change-Id: I4f5284ab3445e89a2394386ca0da6ae8cf613906