Merge "Fix issue with Constructor proxies."
am: e16259f9df

* commit 'e16259f9dfef36728ac50d6ec7b4444fa8ecb772':
  Fix issue with Constructor proxies.

Change-Id: I31ecb5ff33bd05f5bd88c85be7b2999178a8eacf