Fix issue with Constructor proxies.

Bug: 28659889
Change-Id: I4307916c79e7b56608c3ff5c9bbe83e175254f28
(cherry picked from commit 52c9da0925c67265bf353f5a66b7cb5541a88046)
4 files changed