CidKat: Changes to toggle between CM and KitKat

Based on Danesh M commit from 10.1

Change-Id: I04f7728248854623b364cf54d2e48f461e84b3de