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