Merge "Clarify code flow in SchemaAwareApplyOperation"