am e135d7f3: am a61ac525: Merge "Fix module constructor order."

* commit 'e135d7f305c00272ce1544b8243f999bb99979ec':
  Fix module constructor order.