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

* commit '27d099a7e128744b7a11ce09b469a3396e872d33':