Proper fix for hw keys option

Change-Id: If6a3ef1ca46caf55cb7b579071690885b05c61a9