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

Change-Id: I41d4e0d8c0fbf0eb1bdf0d1722da3626e0b97213