Not all classes are matched correctly in feed output because of regex used. Fixed it by updating regex and adding unit tests Bug: T36801 Change-Id: I6e7a883caee2a36c11966991b19ba93c229683cf