An ugly hack to workaround the tag issues with sanity

Until we move to load-list this hack can be used

Change-Id: I97cf9b5870809289b26a0989236c3970a87667a4
Merge "An ugly hack to workaround the tag issues with sanity" into R2.0