switcher 90% done

Change-Id: I999e011e44c107225c82a2041f6635f63204c2b1