Don't explicitly specify no prefix/suffix.

Bug: http://b/129068177
Test: treehugger
Change-Id: I987c88c17b7d1fd01129545bdbd4178de446188c
1 file changed