Edits to topics per an email

Change-Id: I5cf15d3644b3edb4dee0edb67a90b74572edce47