Fixed fifoadm diag command.
Merge branch 'test' into dev