Also handle global IP blocks

Change-Id: I550ac47813bb579d84ba49b6aeefaedbbee1da35
Merge "Also handle global IP blocks"