Update plugins to enable dispatcher functionality

Change-Id: I5cef4230a5bc19b9ebfcd14e41d0f3c6d946d7f0