am 98957db5: Merge "Test flags before using "info"" into jb-mr1-dev

* commit '98957db5536e93724c2e9e6bd19d5063f9d4dc2c':
  Test flags before using "info"