Merge "Handle deleted instance types." into grizzly/1.3
Merge 'Handle deleted instance types (grizzly/1.3-merge)' into grizzly/1.5

Change-Id: Ie8db619a7daf5c8e5d258e5a1fc4060a52f1779f