Fix issue with Constructor proxies.
Alex Light authored
Bug: 28659889
Change-Id: I4307916c79e7b56608c3ff5c9bbe83e175254f28
52c9da09