Fix HW keys auto disabled in clean installations

Change-Id: Iec55d2f58d718bc9983f67078380c08abdbf1c0f