Merge "Update PageTypeInfoParser to be less restrictive."