Merge "Handle deleted instance types." into grizzly/1.3
Empty merge to harmonize grizzly/1.3 with grizzly/1.4

Change-Id: I64da24dae946d5275810f8a50de4ba854c1c9f1f