Merge "Update PageTypeInfoParser to be less restrictive." into pie-gsi