Merge "init: remove Parser singleton and related cleanup" am: 379123f9ab am: bf4afbb288 am: 1b74d14b7e
am: a78298e8a6

Change-Id: I3aaa252ad83a982a471188d5fc2f84f258892cd6