Move the ip into the role and below the bond

Change-Id: I4c2a0bf984b2741adcef09312d3d0bd464b21021
Merge "Move the ip into the role and below the bond" into production