Track CM recovery

-I was managing this my self on my builds but this needs to come
back for now.

Change-Id: I86a3fd2c0c1f8e6a9c0ec5abe33d065e19b8d47e