[automerger skipped] Merge "Add tag error handling when detecting unknown tech-type" into qt-qpr1-dev am: c8bed3da8e -s ours
am skip reason: Change-Id I1f3ffdf32c942f2b7f7587a02d0ce05d8b8f7a5c with SHA-1 3a9ee2ded5 is in history

Change-Id: Ie2e8ef39741ada4c02a4f69af59296e328413477