[SYNC] Synchronize with core, code improvements

- remove obsolete config, sys and string import
- remove unused variables

Change-Id: I88a29b5e3654eb70df412c3f1d65182ccd02811b
Merge "[SYNC] Synchronize with core, code improvements"