Adding class filter and fixing the loss of module path name.  Allow for better filtering.

Change-Id: I7ee64e1a21d57f1f9e40ab27a9830015b805a82d
Merge "Adding class filter and fixing the loss of module path name.  Allow for better filtering."