Merge "Fix IPMS tests timeout." am: 1f9d80f6ee am: 618ff5185a
am: d7bb3192af

Change-Id: I3c27bb789b8c44d6e2c46dabe65bf19452453257