Merge "Replace getNetworkPrefixLength() with public API"
am: e510023c38

Change-Id: If2c371a02c7f9c4b9efc1c9c258791620b895dd9