Since we have our own sched now, we can directly use type rather than subtype for the session topic. Change-Id: I53eaede5d9fd1440bd0bbb9002cdf052b5d0eab3