prd-2100 fix

Change-Id: I67913296ec04b99de033b41a4a28d38ae7c06cca
Merge "prd-2100 fix"