Fixes: 79773317 Bug: 78665512 This reverts commit d253f98c. Reason for revert: b/79773317 Change-Id: I6f3eebd64b94436748986422906006686351cc4b