This reverts commit c0baea54. Reason for revert: Checking if culprit of b/317506400 Change-Id: Icbe9d993c6d4bfdf305f2a4c7b8422095c8846a6 Bug: 317506400