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