Ease new service_plugins and extension integration as well
as improve code readiness.

Change-Id: I9924de51a70e9342c9ac56113c9fbd148a58c322