Update and Clean Custom Toggle

Change-Id: Ie2f2fc7322a2ca7b20446c42bf311e96ef5e60f7