Change SystemApi as per API council feedback
am: a9dc4456f7

Change-Id: Iae3b822e08c49affc6a735adfe0fff1400b798eb