Merge "Fix IPMS tests timeout."