BUG 1898: Fix NPE exception in SwitchManager.

Change-Id: I0fa2607f85ad3b361761e6915ac6574e7ad24de5
Signed-off-by: Thomas Bachman <tbachman@yahoo.com>
Merge "BUG 1898: Fix NPE exception in SwitchManager."