Merge "Fix NPE for UDFPS devices without HBM"