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

* commit '2f0116fa3ab2153188e43e87b194afae7e4efb81':
  Prevent null allowableAccounts from crashing