Revert API breaking change in  System API.

Change introduced in ag/616521

Change-Id: Ia95982b051496e123b4a179746aea15c6a0b8a65
1 file changed