[automerger skipped] Fix testIpClientServiceAvailableAfterPolling am: a4709152 am: b0412a7e -s ours
am skip reason: Change-Id I2d607d3ab26bcecd20546041ac4be2892a3fb852 with SHA-1 eb138e5d is in history
Change-Id: Ie29f36b9237ce020a2089260b12a45651931a239