Toggles update

Change-Id: I0ee54fc65b01c607d2029beb45903aa54c57db0e