Merge "Disable AOD translation for flex clock as temp fix" into main