Merge "Fixed ConcurrentModificationException with HearingAids profile" into pi-dev
am: 36f15ae21c

Change-Id: I095a1632f29d9ac94859a3d2eace1bc207632334