Fix typo in the Exception message.

Change-Id: I17a77ccad64b4440cedf967084d3b2a933cd23b8
Merge remote-tracking branch 'upstream/master'