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

Change-Id: Iebe54371dbd5f518b37c3b161b3d38d18127fc59