Track local Calculator

Change-Id: Ia1193d914b97392a793f2835c7a49d41f077c340