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

Change-Id: Ife540b3bda671dcb8016dae86f221a62063bd464