Merge "Fix issue with ignoring dpm policy for first call."