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