Fixed pom fails in unit tests.

Change-Id: I0acbde16576dc26c36031038fe905695581c682d
Merge changes from origin/7.1

8077db8 Fixed pom fails in unit tests.

Change-Id: If0739645301b84db6b3fccd534d5d92f7367128e