Refactored using kmf-content-api version 1.0.0-SNAPSHOT

Change-Id: I2220ea0bc8220ade75ee1fb2e0da83dd02ed2198