This reverts commit 886c3f16352f372f8e384c2dafd74c304008af38. Reason for revert: From result of forrest, it turns out the culprit is not the CL. Hence the revert is not necessary. See https://buganizer.corp.google.com/issues/191742804#comment10 for more detail. Change-Id: If8492233c69d7947300f35f764199a7db1bd0045