Release fix that stops counting [uU]ndefined and redirects

Bug: 66352
Bug: 71790
Change-Id: If3132b8cf443f04a7c7b3d73c9fb318567bb1da9
Add tests for collector

Change-Id: I0603079ef157bcce3fb805d6e499e722b87cebaf