Merge "Enable v8.6 AMU enhancements (FEAT_AMUv1p1)" into integration