Fixes cppcheck warning, should be a little faster Change-Id: I24ebe2085e2f1c771d2a83fba6ebfb8761cfb9ab