am d86ab3c5: am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev

* commit 'd86ab3c539cd548d54620edf8836546695dd7424':
  Prevent null allowableAccounts from crashing