am 6904e036: Merge "Make CheckApi error messages more consisent and informative." into lmp-mr1-app-dev

* commit '6904e0369dbf0d4875368cc29cea3cdc7d993cba':
  Make CheckApi error messages more consisent and informative.