am 25db8dc7: Merge "Change output format to not throw warning on volantis." into lmp-dev

* commit '25db8dc7c6c155168f308b2f730198bc5a021e35':
  Change output format to not throw warning on volantis.