Fix KW issues in hdd connect and isconnect files. Change-Id: If35dc0ce6e22fbc120a50c7b004057c760308737 CRs-Fixed: 2930439