Merge "Ensure proxy constructor is in dex cache" into lmp-dev