Merge "Add additional SystemApi for NetworkStack"
am: 2ffdcc26b0

Change-Id: I2614b1484498ad9d285be5f6628a94983f1561e4