Moved from system API to public API

Fix: 170226261
Test: Manual
Change-Id: Icef3bd23dbd79d60c1d8edc5ce8df07e642d146c
6 files changed