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