Merge \"Bring out your toggles\" into nyc-dev
am: 3aee783837

Change-Id: I50ac9d6382b10335464fb3608afbf0aeb9c1dc7b