Bug #1360700
This bug has thrd party package name changes to facilitate upgrade

Change-Id: If61c7681d486f8c48969c595d9ddeef42af69ec2