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

Change-Id: I04a41127683f45362adc999719a594b2977a8d7e