Merge "Fix NSH patches"
authorGuo Ruijing <ruijing.guo@intel.com>
Thu, 30 Jun 2016 00:42:35 +0000 (00:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 30 Jun 2016 00:42:35 +0000 (00:42 +0000)

Trivial merge