Merge "adb: rename \'flag\' to something less meaningless." am: ff2e26b239 am: a4be88c914
am: df4c2c16ac

* commit 'df4c2c16accf63aae7874c9f992c0804580b9769':
  adb: rename 'flag' to something less meaningless.