Fix breakage caused by merge in Change-Id: I3d9cd91

The last merge of stable-2.16 into stable-3.0 introduced
a regression in a mocked test in the constructor.

Fix the problem and resume a working build in stable-3.0.

Change-Id: Ifcfa8404c8ece7c02508faa4f6334cb0afeb8c1e