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

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

Change-Id: I001069102af646ac0a53d9cbbb106a61199b42c6