Simplify progress bar paths

BUG: 17366831
Change-Id: I7efa215d399e4bf47b41949d313fba4487f068a0
12 files changed