This reverts commit b5b8777686. Reason for revert: reverted in b/348090986 Change-Id: I2cc85dc4bdf9ed3dc2fb4ff77d9dffa3c32dda76
b5b8777686