Merge "Replace getNetworkPrefixLength() with public API" am: f67076dad5 am: 7b82097220 am: 5b182f20cb
am: 9c39357454

Change-Id: Id0f3c816bb95d891cfb9f0109c0afedb7494f222