Revert https://android-git.corp.google.com/g/#change,31178
as http://b/issue?id=2183371 is finally fixed.
1 file changed