Fix for bug 1814 - where the AddressTracker records the same address twice.

Change-Id: I79b824e81605097060ba37f51370480f1ef81fae
Signed-off-by: Alex Fan <railor33@gmail.com>