Merge "Change SystemApi as per API council feedback"