Simplify getIndexSuffixForNamespace() logic a tiny bit

Change-Id: I8be452dfb3e80809441503b4ff384b957f88175b
Merge "Simplify getIndexSuffixForNamespace() logic a tiny bit"