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

* commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4':
  Fix build breakage in older branches by avoiding <> notation