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