Get latest n1kv plugin changes.

Change-Id: Ic9e0326f6a4e83dd0227a15b68c990c4f7426824