Merge "Expose the following as system APIs"
am: 119d0fa9ac

Change-Id: I26c045e96b728ee70232f1ad4b7d3647c630dca7