am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation

* commit '9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
  Fix build breakage in older branches by avoiding <> notation