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

Change-Id: I4761a3906dffc9f45aeb948dc32785bdf9528ab6