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

Change-Id: Ic0c2bc14ed05880082df3452d9e541868827b202