Fix for bug in Fix for wrongly initialized test key am: 0051181ac7
am: 875dcd9082

Change-Id: I374e6fa5beb07fca53a1191564d4d8175b5a6c8c