am 1309152e: am 1fe58202: am ea65c191: Merge "libctest: zap"

* commit '1309152ec189e670d1c246bbabe1f33942e401b1':
  libctest: zap