Merge "Fix the ordering of extra values in the PI." into lmp-mr1-dev