attempt again at intellaplug

Change-Id: I82aee2de186250cfe7e88b9d2b3a7c6814d62817