[automerger skipped] Merge "Wait for IpClient.StoppedState#enter before tests"...
[automerger skipped] Merge "Wait for IpClient.StoppedState#enter before tests" into rvc-dev am: b91dc822 -s ours
am skip reason: Change-Id I90206a16fff1fa12ca7e37e36d49163b6a83e5c1 with SHA-1 c977da42 is in history
Change-Id: I1c8a3ab47e202298df5a6acf79879d202023a5a2