Merge "Remove LAST_FORWARDED_NUMBER reporting." into pi-dev