Changes to support shared authentication between CMDS and Shift iQ