Merge "Give IAE for invalid sdk a message" am: dc3e45c584 am: d4707ec21e

Change-Id: If9afeb4f6532ab252ea1317c1a12f05de90a7362