This reverts commit 53eb35cd82. Reason for revert: b/233081774, caused long build times in FrameworkNetTests Change-Id: Ide01c994f694b55fc0e87bb0e81584ac44196e68
53eb35cd82