Due to recent change to speed >=7 from commit:219cdab6. Change-Id: I366e7750ec91119881050ff6c05849504c7959e8