am f5cb0a13: am fc0b4ff1: Merge "init: Fix parser line numbering"

* commit 'f5cb0a138528144f3bb1cf6bbcb3c4e4ad5e9dc9':
  init: Fix parser line numbering