Merge "Fixed ConcurrentModificationException with HearingAids profile" into pi-dev