am 7654123b: Merge "Ensure proxy constructor is in dex cache" into lmp-dev

* commit '7654123b2fd7abeb40522dac791fa26a1364d030':
  Ensure proxy constructor is in dex cache