am 6996ce22: Merge "Quick: Avoid unnecessary GVN work in release builds." into mnc-dev

* commit '6996ce22986ddf19b89c7582973d55b329b1436e':
  Quick: Avoid unnecessary GVN work in release builds.