Fixes bug 1084129 Also fixes non-i18n raise messages. Change-Id: I077662329d17427fa3efa7269244248613a6ab85