Catch Torch Service up with CM

Change-Id: I49bd5edfec3dc8f7ffebd10a63270bff51e6eaa1