This reverts commit 0796ebff. Reason for revert: Looks to have broken master b/171738702 Change-Id: Iac7a680dd15b5c884fa74592484b7c094e3177c4