This reverts commit be4f735cb1. Reason for revert: Resubmit the CL http://ag/3983388 that was reverted. The server side change has been deployed now. Bug: 78920513 Change-Id: If676799176ecf90fd51a97027a9ff83bec5d4bed
be4f735cb1