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

Change-Id: I5416b90d04148c4d388496b60052df7012a2754f