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

* commit '71c0366fc7f5436c6cffc2f43637f487dd734444':
  Fix module constructor order.