Merge "Change SystemApi as per API council feedback" into oc-mr1-dev
am: a22dcfed28

Change-Id: I924dff530736fced6ca12543ead67314aec11bff