Let the cdf update order match the actual coding order Change-Id: Iaac0830b2530228ce1a4ea95d842c573dd3d0684