Merge "Fix IPMS tests timeout."
am: 1f9d80f6ee

Change-Id: Ia73f410da8c42e9933dd290deacb82909b4348a6