Merge "Add search paths for xml files for MediaProfiles"