[automerger skipped] Merge "Expose netId by adding getter API" am: b2b692e157 am: 80da442731 -s ours am: c0ae0ca544 -s ours
am skip reason: Change-Id Ieb1483c146aa2f7d8f251157e6e81d71c44ae899 with SHA-1 587ecb3a1e is in history
Change-Id: If69d39b0f065d668b248a10d1a59b43e2ae75f54
This commit is contained in: