Cleanup embedlite changes
Reset APZC embedlite changes, in order to merge with upstream 27 properly
Merged most important APZC changes from upstream