Merge "[Mainline] Network netId to getNetId() migration"