fix PRD-2446

Change-Id: I8632a30c98f2a68efa11d627181a0445cccf6fb4
Merge "fix PRD-2446"