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

Change-Id: I8cdbb82cd6fee604775764519dc8bf835a9c3738