0a7b0022da
This reverts commit 853d7d3b4c.
Reason for revert:Probable culprit for b/323976612. Will be running through ABTD for verification and before submitting the revert.
Change-Id: Ie334d4ec7d8cdad7245610b9384cd3a61f44dc9e