Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5
am: 7b82097220

Change-Id: I0e948700ba76f81db98628f35313dd11ff45df98