This change makes test execution a bit faster. Change-Id: Ie46b6ee0a62d4f6fd40f199b7da03e8ac814ad32 Closes-bug: #1507535