Track browser from Mahdi

Change-Id: I679ce659ccc938b8d1e7fc1021e21ab9f4197d27