PRD-2019 fix

Change-Id: I3b58cee0b042f9fef08911ddbfdf01e9a95060ff
Merge "PRD-2019 fix"