Adjust code for API council feedback

Bug: 151322799
Test: NetworkStackTests
Change-Id: Ie0856f6d516096923f5f8b5c7df2965c5f853d08
1 file changed