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

Change-Id: I4c746b570470301f076efca9d4897cb2032a3732