COMPMID-1724: CL Implement Prod fix

Change-Id: I9cf07afe6198e3364ede06faaa9a09a782a34792
Reviewed-on: https://review.mlplatform.org/519
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
12 files changed