...so that they match the order in the scp2-generated counterpart

Change-Id: Id0a77536081872a5feff7f98417462bd7fd057b3