Fixes to allow CPqD switch to connect (eventually)

Change-Id: I5fff883d8458de4c9924051480caa6e3268ffef7
2 files changed