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

Trivial merge