H9: Don't collapse topics in the topic namespace

Change-Id: I593842e77bc0870ee28b09966fe9918a7af81cc9
Merge "H9: Don't collapse topics in the topic namespace"