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

Change-Id: I257b51a4f0be974eacf8a6c0f12b5d5aacdc7a5f