Rebase intelli_plug

Change-Id: I0ec50bd700fa527e5f40f1384f407495406f60d2