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

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':