am 9a7366e8: am fa7e2586: Merge "Test flags before using "info""

* commit '9a7366e8943990619c494548050aa906f1971332':
  Test flags before using "info"