Bug: 32561414 Bug: 62918393 Bug: 62044295 Test: runtest frameworks-net Change-Id: If23993b5e391947ecbdc01677f0a643144794b2b