Use kmsgenericstrucutre from kmscommons library

Change-Id: I76af67531fc67b05b6b604bab2256eed16f15c95