am 119dcd84: Merge change 25859 into eclair

Merge commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7' into eclair-plus-aosp

* commit '119dcd8400b33241a6081b2f4ba4e3a8764896d7':
  Improve error-handling when an expected token is missing.