Catch Torch Service up with CM

Change-Id: I49bd5edfec3dc8f7ffebd10a63270bff51e6eaa1
More torch goods

Change-Id: I8c012f5c0088ae81c038d0926f0c3e0747a61764