Improve support for Type 5 high density Tagi (>8K).
am: 867d5c37f2

Change-Id: I85234ba5d8764f4deb87b9f66e8b868edc960f84