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

* commit '90d5bd8daab404afc50470f5c19ea725bd2466fe':
  Fix build breakage in older branches by avoiding <> notation