a80997d9eb
This reverts commit 21ab3b979b.
Reason for revert: Culprit for b/326611479. Will be verifying through ABTD for confirmation and before submitting the revert.
Change-Id: Ib71791d159b3ac65ca332f58500341a1a0fe36e1