Merge "Check correct err variable on wifi keystore HAL"