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

Change-Id: Ie923c20e07ed6c7fe5338769d7c8ffa0092de02d