Merge "Fix typo, caps in error messages." am: ae0f53cf69 am: af8f8a1561
am: 9155aa3035

* commit '9155aa30350b2ee444d4061f97d13c1200a79d41':
  Fix typo, caps in error messages.