Add support for editing topic

Change-Id: Ia6a748acfd1222e0874c4b5ce66df057b07c5b16