Merge "Add tag error handling when detecting unknown tech-type" am: bcdb29a2a0
am: 80ecc846d2

Change-Id: Icc3ac4de9a06da4614ea0330a55a9eb870d9e25c