Use StubObject::unstub()

Change-Id: I0173a658c09f7aaf35e6e8130f08da30279e466d