Cherry-pick the relevant parts of master change
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict

Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d
1 file changed
tree: 8df00bd70144d1e9326ebac6063e067d2e249426
  1. core/
  2. services/
  3. tests/