Initial checkin - some data sanitizing code

Change-Id: I5e45f0ee8a8427307b4250e34cfcd030b7f355d6