Merge "[adb] use zip iteration with functor"