Merge "Fix an issue in NPMS blockedReasons computation logic."