Change SystemApi as per API council feedback am: a9dc4456f7
am: c38df28c41

Change-Id: Iec0a8981ed6beef9e29e6a00781681614a5b1809