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

Change-Id: I0871973d37267215fc31455015a37e6a8a60d821