am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build...

am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 automerge: dcce25a
automerge: 4f78e0b

* commit '4f78e0b1e849193f5e70447171b4f30ad0aee700':