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

Change-Id: I6f950b03197765f67792add3e52ee66ee44ae23c