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

Change-Id: I0e4a5e3eae67fe97b26925e5eeb0eeb0a70c979d