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

Change-Id: I3c47755cb326ff6147ebd0c2052bdabd1187450a