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

Change-Id: I726f41142ead73b0a579b01ea477df63e74673e5