Merge "Fix typo in IpConfiguration comment" am: 7b7e05459f am: a42857e3a4
am: 4d0997093e

Change-Id: I58b8e7c793d73ea53f11d66bc6f709d0c4f0c5aa