Merge "Add required sphal back to swcodec APEX - DO NOT MERGE"