Update Condor Cherries

Change-Id: I5def7b8617a005311cd9aa691a20e911bb6c867e
Merge "Update Condor Cherries" into pac-4.4