prd-2121 fix

Change-Id: I28832ad8f0d3893ce5a7deda23bdce9ca4928055
Merge "prd-2121 fix"