Fix CustomToggle Actions as well.

Didn't notice this, was building against an old sync.

Change-Id: I8076860512341340c0e8b81d9b78c596a025508a
Merge "Fix CustomToggle Actions as well." into jb-mr1