Merge "Prevent null allowableAccounts from crashing" into mnc-dev