Merge "Marking SoftApCallback methods as SystemAPI"