am c18a034e: am 47c0fcd0: Merge "initialization of defined variables"

* commit 'c18a034e1654f3c6dfbb73212630465c33f0a07e':
  initialization of defined variables