am d4376c82: am ac8d57c2: am bb9bfba8: Merge "Don\'t crash if account label is null" into klp-dev

* commit 'd4376c828103743ba3e9dd8a821b904803497873':
  Don't crash if account label is null