and set impl object accordingly.

Reported by: Du Jing
Fixed by: Andre Fischer
(cherry picked from commit dbd0cea6)

Change-Id: I210ec0e696e673309aad64a1e157e207bea10a66