Fix issue with Constructor proxies.
am: 2f7c9d9613

* commit '2f7c9d9613978dc6b135b42b0e5e57f22b82cc9b':
  Fix issue with Constructor proxies.

Change-Id: I3e52ac890c63182306a9ba5b65371138a4011742