Merge branch 'master' into 'security-CKM' branch
authorSachin Agrawal <sachin.agrawal@intel.com>
Mon, 31 Aug 2015 23:37:38 +0000 (16:37 -0700)
committerSachin Agrawal <sachin.agrawal@intel.com>
Mon, 31 Aug 2015 23:37:38 +0000 (16:37 -0700)
Change-Id: Ia1d47de74e1f6c39595806c68196c1d38e4a5815
Signed-off-by: Sachin Agrawal <sachin.agrawal@intel.com>

Trivial merge