Merge "Fix IpClientTest" am: 5e823ab263
am: 3d212804df

Change-Id: Iaf861221325d914202f4d9d7f7d584b7bba7a774