Track Calculator from CM - fixed commit

Change-Id: I8581144ac189f62bfd408ffa42f4d7cb5c03100c