Merge "DO NOT MERGE: Fix bug in product path building" into nyc-mr1-dev