am c6c51a1d: am 6b205498: am 1aa39ebf: Merge "Simplify progress bar paths" into lmp-dev

* commit 'c6c51a1deb0c15dcb99856603e3fd801babef361':
  Simplify progress bar paths