PRD-1976 fix

Change-Id: Iefeb5804b57debe19329ab531269cd686d3f371b
Merge "PRD-1976 fix"