DO NOT MERGE: Fix bug in product path building
am: 9914284d6a

Change-Id: I94410e65b1e1bbdf05cddf7cbf11f9b946f64dd5