Fix name-suffix rotation crash, for real this time

This reverts commit 97b2ccd1e32457382dd5ce7c0ee2a3ab485d8be9.

Bug: 16558948
Change-Id: I736a55c33867e7442ac55417fcb2112c3d7d641d
1 file changed