Merge "Correctly preserve key generation parameters" into pi-dev
am: 6f7cfb0627

Change-Id: Id7fb68a441e873f7ae844bfc87f7f60798ecd57c