Merge "Verify for type_id out of range errors"
am: 0e5e9fd335

Change-Id: I518647ad95f43009faedc6856e414c85a95ffe44