Track Calculator from CM

Change-Id: I841cc2a6ddebdaa9e892cff9b158834c1b735663