am f580593c: am deed673a: Merge "Use std::enable_if instead of a custom helper class."

* commit 'f580593c87ce2e2acaeaac9a7c0d3245cbb0a1e5':
  Use std::enable_if instead of a custom helper class.