Merge "Prevent OOB read in i93 tag detection" into qt-qpr1-dev am: 1fabf83308

Change-Id: Iec941a01afdaebbe7bc68a44ab63259aa0d79943