57e490cf8c
This partially reverts commit 3e5fbca0c57742f28f5c7e6bda6c3500b9471b47. Bug: 35187548 Bug: 30188076 Bug: 35089332 Test: make checkbuild Change-Id: I7ab4279aab604e3d56003b0a59867948aebabd28