Merge "Fix wrongly initialized test key." into pi-dev am: ba2fa43da6
am: a752db0f48

Change-Id: Ib3721897f45b848b5597a7246ae54a5d6b772be8