fix PRD-2445

Change-Id: I30eb024e7443b54c914a1115ee65eec3b60e8da5
Merge "fix PRD-2445"