Merge "Remove more Quick-related macros in tests." am: 7fa1f92
am: be72bec

* commit 'be72beca9ec185c85d1cd16c2c23b24cfefe1f4d':
  Remove more Quick-related macros in tests.

Change-Id: Ic7caa127a2a43cce96d47ffd9cb7bcb49121e463