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

Change-Id: I389702addf0dbb2953ec4682b047c7945b80e47b