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

Change-Id: Ibb4d2d0ee8dbaba65e0982061a6cea7f2eafb969