Merge "Remove DH keygen special case"
am: 151ca156c5

Change-Id: I1cb9f5c294858e0ab8ffeadbce83f7c75119564e