This reverts commit e7edc9e446. Reason for revert: Probable culprit for b/320755845. Will be running through ABTD for confirming and before submitting the revert. Change-Id: Id989e182396c498afd3f15b70977ba5fba22c557
e7edc9e446