am 501244ea: am 563efe4c: am 85f23210: Fix test build

* commit '501244eaec4207efd413bac4b0bb86ec15f97bf5':
  Fix test build