[automerger skipped] Merge "Replace getNetworkPrefixLength() with public API"...
[automerger skipped] Merge "Replace getNetworkPrefixLength() with public API" am: 8e5a5bb0 am: ff163c27 am: dda6bb45
am: e2f1d08d -s ours
am skip reason: change_id I6828f2096a0d1292dc8834a1ff980cfd37c9c44c with SHA1 74c78480 is in history
Change-Id: I31acdd5abb2ffd721bcf3848b31e1aa78bb2f22f