Merge "Add chameleon diags dependency"