Patch from Huahui Wu.

Fix http://b/issue?id=1908085
1 file changed