am 16117fa1: am 457ba902: Merge "fix typo for exception message"

# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '16117fa197f7dccb73ad7f710cb6e09f1abef20a':
  fix typo for exception message