The reason for not to fix the test instead with new annotation
is that it's preferable to have a single version that works for
all platforms.
This can be revisted once we have enough platforms released to
not to care about the older ones.
Change-Id: I42557f920702e5a65e39a3fea80533bd07b54367