Don't blow up on an empty core team list

Change-Id: Ie75315a95b6be6e4efd6106f40eff83e303ed936
Merge "Don't blow up on an empty core team list"