reverting b/559979

Change-Id: If4e58c67d4424ade68198a16c1d2d21595504efd
1 file changed