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

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