Fix typos.
Merge remote-tracking branch 'origin/pr/7' into 1.24.1

Conflicts:
	sample/client/EDAMDemo.java