Merge "Update PageTypeInfoParser to be less restrictive."
am: 0f34408378

Change-Id: I5c4f3ae15c6bf0c87d46354e1a4b45c85a458956