Bugfix: Clean up ugly merge mess that left the wrong getSecret() method

Change-Id: If196d029b5ccb7367c38c3e3dd3d8c10e79db4e4