Merge "[adb] use zip iteration with functor" am: 26a8ed983c

Change-Id: I90aa462916891634b5406f0408aff02b0a3e97a5