This reverts commit f981bdde. Reason for revert: b/265950512 Change-Id: I562e7e125367658061c4e9b0de36392d1ce0358a