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

Change-Id: I257b51a4f0be974eacf8a6c0f12b5d5aacdc7a5f