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: 5c9d0de1 automerge: 9e7e8afb automerge: 27d099a7 automerge: 4a826358 automerge: dcce25a9 automerge: 4f78e0b1
automerge: f96d6bc6

* commit 'f96d6bc6':