Merge "SystemApi for dex module registration"