Syncing percent test setup with other parts of support library. am: bcbbc065a6
am: 94faaa0e47

* commit '94faaa0e4724024ed02e36d72323675a7dd0f2b4':
  Syncing percent test setup with other parts of support library.