Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev