Merge "Fix IpPrefixTest#testContainsInetAddress fail." am: 66a133858b am: 9872066d02
am: c13f50f5af

Change-Id: I9e74dc9bf30a53ce78395e502a52891ba488f4b1