Track own Calculator

Change-Id: Ibe5e4a6aeb21fa4659b60888e2f5d112203abf06
Merge "Track own Calculator" into kitkat