am dd198b77: Merge "Move installed module dependency setup after proto handling."

* commit 'dd198b77a1bae9974b741cc7d1dad328dce3c3b6':
  Move installed module dependency setup after proto handling.