Merge "Merge branch 'security-CKM' into 'master'"
authorSachin Agrawal <sachin.agrawal@intel.com>
Mon, 28 Sep 2015 19:15:55 +0000 (19:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Mon, 28 Sep 2015 19:15:56 +0000 (19:15 +0000)

Trivial merge