Change parser to make formatter work

Change-Id: I6c51cee7ec202ef741bb5cba127a4f8b12a44d6d
Fix header length in AR generator

Change-Id: I8f253ad36ea4f19bd0d061b459416d7ab38622ad