Squashed intelli_plug v3.8 update

Change-Id: I5027b80ef4ddad1f07f6eeb03628a5e23ce927d6