Merge "Fix flaky IpPrefixTest." am: 2cbce2cb27  -s ours
am: 7d752a872d  -s ours

Change-Id: I216b50a8d0f51f2f731b17598b205a7b0ad65324