Fix for topology failure on reboot

Change-Id: Iec621a6cfcf88db2660a851edb69e7703d6ccbac
Merge "Fix for topology failure on reboot"