toolbox can diaf

Change-Id: I2eecceca92964280ab8367304cde4c20873a6c1b