This reverts commit 5f893533. Reason for revert: This CL causes build warning. Change-Id: Ia808f7e8d13ece3397b18b166780854d1b15cc9c