[automerger skipped] Merge "Update PageTypeInfoParser to be less restrictive." am: 0f34408378 am: 884b86fe77
am: d3e4700c9b  -s ours

Change-Id: I6211c03ae84c0e2d376419507a01a38c12bb47ea