Merge "Initialize key structure to zero in charger" am: ef0252108c

Change-Id: I54fec19c99b8483344bb8e3687debea8eddd24b6