Merge "wappush: Use valid index for pdu including garbages" into klp-dev