This reverts commit 1c19cf383f. This change does not have any topic: not reverting the other 2 commits in the original topic. Reason for revert: broke FrameworksNetTests presubmit: b/130397860 Change-Id: Iff41d9fe97fafea44680c8d67d1ce19277548cc0
1c19cf383f