Merge "DO NOT MERGE: Fix bug in product path building" into nyc-mr1-dev am: b7dece1b0e am: d8c1fbc1ef
am: 10c50f4c50  -s ours

Change-Id: I46f284256cec8b907fe891ebad315c50ffdfaf08