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

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