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

* commit '4a826358e769e697ec329cf14edeb049981a11a9':