fix encap testcases
Change-Id: Ie35177d8aade9d32c695df1e2fa341a05d0cdb6a
Merge "fix encap testcases Change-Id: Ie35177d8aade9d32c695df1e2fa341a05d0cdb6a" into R2.0