Merge "Don't explicitly specify no prefix/suffix."
am: 480d18c472

Change-Id: I2c17e2010e34cc6857d48209a3d0f4f5a7dee8dc