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

Change-Id: I3057408f475e9c2e4a1147ad9d33c50d0f62c7dc