prd-2021 fix

Change-Id: I2560a8333344e304d01744af2802a48769ab8340
Merge "prd-2021 fix"