Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev