Merge "Initialize key structure to zero in charger"