This reverts commit ca0f06f1. Reason for revert: b/241591738 Fixes: 241591738 Change-Id: I3700ac1499a1e6aaf28cd96e4e35847969a364ee