Merge "Remove package code path for all parsing failure" into pi-dev