Revert submission 23556316-compose_drop

Reason for revert: b/286077407

Reverted changes: /q/submissionid:23556316-compose_drop

Change-Id: If0c30aaa81f89131842699b3700155997ae5ebfe