This reverts commit 62e3b162ba.
Reason for revert: Possible culprit for b/301966780
Change-Id: Ice6babe404feeddf9f8b13ce2a6288005402c9cd
This reverts commit 62e3b162ba.
Reason for revert: Possible culprit for b/301966780
Change-Id: Ice6babe404feeddf9f8b13ce2a6288005402c9cd