[automerger skipped] Merge "Give netId a getter as requested by the API...
[automerger skipped] Merge "Give netId a getter as requested by the API council." am: 1f12afd0 am: 701db5b4 -s ours
am skip reason: Change-Id I7de0788e57b2b53bc951d9b41304cc4314c1cb91 with SHA-1 ae1d7869 is in history
Change-Id: Id7785e32958cbd39326f03db67cc179a3fa618b1