Change type CUSTOM into UNTYPED.

Change-Id: I407fbd2fd9b9482db34962a49761e8a089f279ab