msm: intelli_plug: merged with last N5 changes - v3.7

Change-Id: I61789a9a7cf00452a348b357aba03c3810a93d9f