Code review updates for pco2a parser.

Change-Id: I891d5feb5f365a8469f4126de05acb0e56e0cdb7
Merge remote-tracking branch 'origin/pco2a' into pco2a