This reverts commit 8858eac1. Reason for revert: It was a temporary fix to get the build bots(go/ab). Change-Id: I27321b69cfcf6f39c01276639c2bb5711469ed5a