am aa4c8870: am a1e09b1a: am 98ae7985: Fix using variable intermediates.COMMON before defining.

* commit 'aa4c8870a802e317fda14f0574b00d844a4b4716':
  Fix using variable intermediates.COMMON before defining.