Fix Carbon toggle and other stuff.

Change-Id: Idb0ddd1bf335cfc8a2b10637f568edd484cd7115