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

Change-Id: If0130687c82c207019e6ed8631696928bc81716c