Merge "Fail gracefully if we get a bad API whitelist." into pi-dev
am: 611443e984

Change-Id: I2ead19c8fda255d010aded3884aef0016e1cc74d