This is clearer and less dangerous locking-wise

Test: FrameworksNetTests
Change-Id: Ife09fef848144e74ddb02aba3594913899bc9f46