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

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

Change-Id: Ic6016f9ccadbf002476affc8f83ff067b6fa6bdc