am 3bc628b2: am f5e2dc89: Merge "libctest: zap"

* commit '3bc628b2d4ddc3f53989bdb17f630bdf105aa1d8':
  libctest: zap