Merge "Refactor now that these path constructions are always the same." am: 74f0c431a2 am: 3b5ae15c86

Change-Id: Ib47f529e06377704e37566fa62d21e351ccd0b93