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

* commit '7c67e4e423f7608c50a1fc7c355d87593cfdbcca':
  Test flags before using "info"