Fix dependency issues

Change-Id: Ib3a4e56c395986f5cfc6e2662855a7876c60d65b
Initial porting bundle ITs to pax

Change-Id: I2448c3d37488e4c2f5cbc65e1dac229d983507f7