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

Change-Id: Ie8d1934205810586812714e5a63f10dc5fa01841