am 5ddf2e7e: am 32881e8d: Fix NPE after migrating older account

* commit '5ddf2e7ee7277b54042be818feac5bd97f8fb6bb':
  Fix NPE after migrating older account