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

Change-Id: I5bdc50e7886731f61222bd1edd33765941118175