capella: decom

RT #6160

Change-Id: Ifc8110082fa907631cbb68e862bcc631fc8a430b
Merge "capella: decom"