Merge "Rollback SystemApis for Mainline" am: 127fd8d6e8

Change-Id: I3f6beffb6459e095e766f483d13ff7831e60d75a