Merge "Fix IpPrefixTest#testContainsInetAddress fail."
am: 9c58ddc48e

Change-Id: I0926ee39c306fefdd158e1c4c7e4c1ba4b7c5f7d