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

Change-Id: I84fd175995a277c4aa8fd430fe6007c62d7cbd0a