Merge "Fix policy api credentials for oof in oom"