Merge "Delay the transition to AOD1 if udfps is activated" into sc-dev